Improve admin theme handling #4756
Conversation
github-actions
bot
added
Component: PayPal
Install script shouldn't be needed, because the standard admin theme does fallback to the new base theme. So no changes needed |
|
XML layout has changed. When i switch to this branch admin login has no bg and i see old legacy theme. Until layout cache is flushed. |
theroch
changed the title
|
GitHub says the branch has conflicts that must be resolved. I am not able to use the online editor for checking. Here is the file name |
|
Just needs an rebase |
Hanmac
force-pushed
the
designLayoutUpdates
branch
from
b3d605b to
d9302bf
Compare
There was a problem hiding this comment.
Pull request overview
This PR improves admin theme handling by restructuring the theme configuration to use a package-based approach instead of theme-based switching. The changes move the admin theme from "default/default" and "default/openmage" to a package-level selection between "default" and "openmage" packages, both using the "default" theme.
Changes:
- Restructures admin theme configuration to use package selection instead of theme selection
- Adds fallback logic to handle non-existent themes and parent theme layout updates
- Updates file paths in configuration files to reflect the new "base/default" structure
Reviewed changes
Copilot reviewed 7 out of 776 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| app/design/adminhtml/base/default/etc/theme.xml | Adds new theme configuration file for base/default admin theme |
| app/code/core/Mage/Core/Model/Layout/Update.php | Implements layout update fallback for parent themes |
| app/code/core/Mage/Core/Model/Design/Fallback.php | Adds theme existence check and fallback to default theme |
| app/code/core/Mage/Adminhtml/etc/config.xml | Moves openmage configuration from theme to package level |
| app/code/core/Mage/Adminhtml/Controller/Action.php | Updates theme selection logic to use package instead of theme |
| .phpstan.dist.neon | Updates file paths from default/default to base/default |
| .phpstan.dist.baseline.neon | Updates file paths from default/default to base/default |
Signed-off-by: Frank Rochlitzer <[email protected]>
Add @param Mage_Core_Model_Config_Element $updates and @return Mage_Core_Model_Config_Element to improve API documentation. Co-authored-by: Copilot <[email protected]>
Explanation for array manipulation Co-authored-by: Copilot <[email protected]>
Removed unnecessary docblock comments from the method.
Co-authored-by: Copilot <[email protected]>
|
| $layoutXml = null; | ||
| $elementClass = $this->getElementClass(); | ||
| $updatesRoot = Mage::app()->getConfig()->getNode($area . '/layout/updates'); | ||
| $updatesRoot = $this->addFallbackThemesLayoutUpdates($updatesRoot); |
There was a problem hiding this comment.
The new method addFallbackThemesLayoutUpdates() is called here but there is no test coverage for this new behavior. Consider adding tests to verify that layout updates from parent themes are correctly merged into the fallback chain.
4 participants
Description (*)
Done by Suggestion of #1216 (comment)
Related Pull Requests
Fixed Issues (if relevant)
Manual testing scenarios (*)
Questions or comments
Contribution checklist (*)